[NET-7557] Backport of Fix to not create a watch to Internal.ServiceDump when mesh gateway is not used into release/1.14.x#20731
Merged
zalimeni merged 5 commits intorelease/1.14.xfrom Mar 11, 2024
Conversation
zalimeni
force-pushed
the
backport/dhiaayachi/fix-service-dump-watch-wanfed/release-1.14.x
branch
from
5dbd414 to
301358b
Compare
…mesh gateway is not used into release/1.14.x This add a fix to properly verify the gateway mode before creating a watch specific to mesh gateways. This watch have a high performance cost and when mesh gateways are not used is not used. This also adds an optimization to only return the nodes when watching the Internal.ServiceDump RPC to avoid unnecessary disco chain compilation. As watches in proxy config only need the nodes. * backport of commit b0ce20b * backport of commit 3d4bde0 * backport of commit b2c7724 * backport of commit e7ab4d4 * backport of commit d00d9c5 * backport of commit b2db3d5 * backport of commit 50fb45a * backport of commit 7b41a61 * backport of commit 2fa0e0a * backport of commit 88849c9 * backport of commit 4ac54f1 * backport of commit 2a9dfc3 * Fix tests for backport. --------- Co-authored-by: Dhia Ayachi <dhia@hashicorp.com> Co-authored-by: Derek Menteer <derek.menteer@hashicorp.com>
backport of commit d399654 Co-authored-by: Semir Patel <semir.patel@hashicorp.com>
backport of commit c9a08b3
zalimeni
force-pushed
the
backport/dhiaayachi/fix-service-dump-watch-wanfed/release-1.14.x
branch
from
301358b to
792c6d8
Compare
Member
Author
|
Tests look to be passing except for the |
zalimeni
changed the title
Internal.ServiceDump when mesh gateway is not used into release/1.14.xInternal.ServiceDump when mesh gateway is not used into release/1.14.x
hashi-derek
approved these changes
Feb 27, 2024
zalimeni
force-pushed
the
backport/dhiaayachi/fix-service-dump-watch-wanfed/release-1.14.x
branch
from
fd9f21c to
bd1d6e2
Compare
These tests fail on an unmodified version of release/1.14.x, indicating they require later fixes that were not backported to this branch in order to pass. Disabling for now to enable patch application and testing.
zalimeni
force-pushed
the
backport/dhiaayachi/fix-service-dump-watch-wanfed/release-1.14.x
branch
from
bd1d6e2 to
5e78a50
Compare
zalimeni
deleted the
backport/dhiaayachi/fix-service-dump-watch-wanfed/release-1.14.x
branch
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
4 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Description
Manual backport of #20168 to
release/1.14.xto facilitate upgrade to supported Consul version for customers currently behind 1.15.Also includes backports of 2 unrelated CI-only PRs needed to unblock CI.
This backport is a direct cherry-pick of the squashed 1.15.x backport commits for:
Internal.ServiceDumpwhen mesh gateway is not used into release/1.15.x #20266Testing & Reproduction steps
PR Checklist